<<<<<<< HEAD
// 12212112   
console.log('冲突一下，再来个人修改代码，拉取一下')
=======
console.log(1)
>>>>>>> a930c86bff3c65a6aff0cc19d90521fb58163cdd
